Adwaita: Use $menu_color background in popover.menu

GtkPopoverMenus should mimic menus. Commit d936967b7a8 introduced
some CSS related to menu popovers, however, it hardcodes 'white'
as the background color. That is problematic for the dark theme.

Use '$menu_color' instead of 'white', since $menu_color both
guarantees menu popovers and menus match, and already handles
different colors for dark and light theme variants.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2e257ea6257d0709f8cdedaa4ce4c61e990c45a9..534592abb71130cc01e8c0a597482bdbe6013430 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4767,7 +4767,7 @@ popover.menu {
   }
 
   &.background contents {
-    background: white;
+    background-color: $menu_color;
   }
 
   &.background separator {

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index dbc07bb542548254e9eaac451ac63cf29ec54b7d..20c0745d9839c3ddb1bc8f881052ed86565bfe96 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2063,7 +2063,7 @@ popover.menu box.inline-buttons { border-radius: 5px; border-style: none; border
 
 popover.menu box.circular-buttons { padding-bottom: 5px; }
 
-popover.menu.background contents { background: white; }
+popover.menu.background contents, popover.menu arrow { background-color: #2f2f2f; }
 
 popover.menu.background separator { margin: 5px 0px; }
 

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 9b412cf4994024f45ceef33a435c86c4a1d93dde..43b1a47539706595f10219fab46519177b373dbb 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2079,7 +2079,7 @@ popover.menu box.inline-buttons { border-radius: 5px; border-style: none; border
 
 popover.menu box.circular-buttons { padding-bottom: 5px; }
 
-popover.menu.background contents { background: white; }
+popover.menu.background contents, popover.menu arrow { background-color: #ffffff; }
 
 popover.menu.background separator { margin: 5px 0px; }